Merge "DO NOT MERGE - Removed FLAG_EPHEMERAL from pre-created users." into qt-qpr1-dev
am: 002deeda0c

Change-Id: I4e8f850dc761c14362061f39a0e70cfbc09f0b73