Merge "Fixed a NPE in AccountManagerService" into jb-mr2-dev