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

* commit '09714a76a9463f5e18ea8ac91ba040f6fd2235fd':
  Minor style changes.