Merge "Fix AccountManagerServiceTest" into tm-dev