Merge changes from topic "build-fixes"
am: 3ca30dede8

Change-Id: Ic153857bac2e30b3abaebb1cdbdfa114df5b493d