am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev
automerge: 5906563  -s ours

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