Fix various warnings.

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

35ce2a97 Fix various warnings.