Fixing warnings.

Change-Id: I94576f936162f7b014444510878081401fa0e9c2
Merge topic 'fix_warnings' into next

68418799 Fixing warnings.