Fix build warnings

Change-Id: Ie24cf8e729813e4527c698fc7c1502a1efbc63e5
3 files changed