Fix build warnings

Change-Id: Ife5e40264f43fb3ccb40830228701003fe106bf5
6 files changed