am 65cad1ee: am 8ec657f9: Merge "New assets for the edit screen" into lmp-mr1-dev

* commit '65cad1ee004856f25cbe7047afcbc92e5229dc60':
  New assets for the edit screen