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

* commit '144508d5da4dec37183617ec259ab83d2db4f012':
  Revert white space changes.