Merge "Revert white space changes." into lmp-dev