Fix unwanted build warnings

Change-Id: I1bd920c70445788c9c077e48c4c5b17c3ec146d1
7 files changed