Merge "Minor style changes." into lmp-dev