Merge "Delay AccountManagerService initialization" into jb-dev