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

Change-Id: If87370f70a0df3207d6db865077aab36687a5e3c