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

* commit '2805669954b70b918d7b24f6695c4da85d6f88e8':
  Avoid NullPointerException if createUser returns null