Merge "Fix AccountManagerServiceTest" into jb-dev