am ddd4b580: am 1bec54a5: Merge "Support editable 3p accounts without nicknames" into lmp-mr1-dev

* commit 'ddd4b5807ee3031be188f09826b2613658f10744':
  Support editable 3p accounts without nicknames