Merge "Keep UserManagerInternal fields referenced with reflection"