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

* commit 'ff0faca23e19ec165c2976aa703b9228ee04adb8':
  Editor name fields