Merge "DO NOT MERGE: Fix several issues with precreated users." into qt-qpr1-dev
am: 8de98aef28

Change-Id: I599a3e6e25a5dc8f3a3847e11fa129dee6474910