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
Change-Id: I64848346824aca147e39998b959541abbb483ec5