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

* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.