Merge "Update UserManager APIs to follow API guidelines."