Cleanup build warning messages

Change-Id: I3628d6af4f4e6ffa9e7255270d7d471734c874df