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

* commit 'fe54f8a4962d1b6366f98c24155432a9a45fd6b8':
  Minor style changes.