Fix build warnings

Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b
2 files changed