DO NOT MERGE: Fix several issues with precreated users.
am: debb009a2c

Change-Id: I3c718154ff8d580f50dc29eccf4f073cafb54784