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

* commit 'ad66480838189332b82cd2861bca4357aa2b93da':
  Avoid NullPointerException if createUser returns null