Merge "Second pass on consolidating usage of AccountManager"