Fix compiler warnings.

Test: mmm

Change-Id: I937ac6ab2da5530ee249e6e87a90d18e9bd3de6e
Merged-In: I937ac6ab2da5530ee249e6e87a90d18e9bd3de6e
(cherry picked from commit 87eef41a5b81391b10a0f4ad874f6f04e261ed84)
1 file changed