Refactor account logic from util and move it into the app helper library. am: edb05a3b am: 55d9a14a am: 93151615 Change-Id: Ic0d08d702156748bd364c8270905b58b7ab80441