am 194da0b8: am a39fdd11: Merge "Fix AccountManagerServiceTest" into jb-dev

* commit '194da0b8b368ac61b23870224bc0d449ad465bd4':
  Fix AccountManagerServiceTest