Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev am: 4be496d2d0
am: 429a0197bf

Change-Id: Ia850b8177732585014563660cf18119e26e691af