am bfa6190f: am 144508d5: Merge "Revert white space changes." into lmp-dev

* commit 'bfa6190fcc5ac607bf7045963d57b06cc2b16207':
  Revert white space changes.