Fix warnings.

Change-Id: I5caea36a157f1622b6f702cd1f726d80fa4e9024
Merge topic 'fix-warnings' into master

945cf14e Fix warnings.