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

* commit 'c74a2b343507546dd5b0a6be5afce42eb8b16a0d':
  Minor style changes.