Merge "Refactor account logic from util and move it into the app helper...
Merge "Refactor account logic from util and move it into the app helper library." into nyc-mr1-dev am: b3527793 am: b7ad5511
am: 12970a59
Change-Id: I05edaf0cf039addcb9dea5c8cc801c82dd863ce6