Fix warnings

Change-Id: Ifce8eed10172b6a41b945abb5a18613f975587dd
19 files changed