am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit '3deade5981372fc44e83c161c7d0dbb9df529e3f':
  Fix project settings. [DO NOT MERGE]