Fix build warnings

Change-Id: I9e3cfa0c6b3467fe763ce55f759d179f02c5deea
3 files changed