Clean up some warnings

Change-Id: I417c5b36badb71c3601df3cc6e505592c96fa661
3 files changed