Correct warnings found by continuous integration testing.

Change-Id: I99f31fee04026b932f43a4ec26131e0c867c8811