Fix warnings

Change-Id: Ie00f6c58a944e2db0539f1119d2983a483b6f10c
2 files changed