Fixes for warnings

Change-Id: I0000000000000000000000000000000000000000
1 file changed