am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev

* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null