am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
  Fix project settings.