Merge "First pass on consolidating usage of AccountManager (1/2)"