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

* commit '83ba89e94a0ae81875d62666cc67e9f5a357d7ea':
  Fix project settings. [DO NOT MERGE]