Fix build warnings

Change-Id: Ic82cc86ac4b63b30ab66e1b8c7fd0e998fea590e
2 files changed