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

* commit '1bec54a5c318860dec6ce7cac501f01a830b6722':
  Support editable 3p accounts without nicknames