Merge "Do not use hidden UserManager hidden APIs"