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

* commit '836f5d986f9dc4d6915aade059ef5ff7e584cde1':