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

Change-Id: Ibe8cf242b664e9adc53aa6987b7ce25249d2af8f