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

* commit 'c62da8a0ba8e230f2d759d2219673553999d9c56':
  Minor style changes.