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

* commit '5935ee2fc9a7f0cfd8be303c8474937aca2ef40c':