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

* commit '51bd204112a032f7b65d90532e77400fc3a3f0fd':
  Revert white space changes.