am 4d9fe6d1: Merge "Rename email extra." into lmp-dev

* commit '4d9fe6d15a4aa661eaea5b34a1810b4986732c4f':
  Rename email extra.