Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev