am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev

* commit '82e281810e0eed731a2adddc19eeb65ae73a0dea':
  Minor style changes.