am b8abb8cf: am ff0faca2: am b7e654fa: Merge "Editor name fields" into lmp-mr1-dev

* commit 'b8abb8cf5dde2bf95ededbffafe45157e55477bb':
  Editor name fields