[automerger skipped] DO NOT MERGE: Fix several issues with precreated users. am: debb009a2c
am: 4b2c7d3e86 -s ours
am skip reason: subject contains skip directive

Change-Id: If95e87c4324b7c58fbdbad4aa8e01c86d42483be