Address additional warnings found by GCC 4.9.

Change-Id: If668a6eb98a6ce7b2872f528b8e3527638814f68
1 file changed