Merge changes from topic "nomake"
am: 1daca537ee

Change-Id: Ie138a4a8bacc1993a124cde17ebe8a6393c1467c