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

* commit '85afc992ea0058155c73b2ad06f130df7bc697f4':