am 3e54ce27: Merge "Adjust owner info to spec" into lmp-mr1-dev

* commit '3e54ce273abafec3a0eca9e7064d5151ec096f0b':
  Adjust owner info to spec