am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser...
am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev automerge: 28056699
* commit 'ad664808':
Avoid NullPointerException if createUser returns null