[automerger skipped] Merge "DO NOT MERGE: Fix several issues with precreated users." into qt-qpr1-dev am: 8de98aef28
am: da91839267 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic84d330aa561513608aa3ecd06f08d109ce6240e