Fix warnings.

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

1a953a3d Fix warnings.