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

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