am 71518174: Merge "Fix project settings." into lmp-mr1-dev
automerge: 4abf088

* commit '4abf0885d7411e92ea0345686781e663a00fc1ba':
  Fix project settings.