[automerger skipped] DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users. am: b286462f68
am: ab15078860 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia40807a4b38f8f7663d9b7b0d4f9c3d61a9dfa40