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

* commit 'def99c9da6c47628ebe2b731387d98a79e63acdf':
  Revert white space changes.