Clean up more warnings

Change-Id: I8fc1a0a55a421ee3dbdcb484fbea71192359471d
7 files changed