Merge "Remove usage of hidden UserManager api."