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

* commit 'a39fdd11e80618acc046fff65b6549b5c8b5aa8d':
  Fix AccountManagerServiceTest