Fix some warnings

Change-Id: I37005da0d650744b0811c6d98d62e99d0dc738f6
Merge topic 'Werror' into master

2969a59a Fix some warnings