Merge "Remove usage of hidden UserManager api."
am: f89e861bbd

Change-Id: I38ce91e0e547a58c90256df0fc54f47303b4e31c