Merge changes from topic "nomake" am: 1daca537ee
am: c5d2629f77

Change-Id: Idd3ed7d21ad44043119881b93e4a17f56314bcfb