Merge "Fix NPE in AccountManagerService."