Fix compiler warnings.
am: 666b76bf84

Change-Id: I186ec89b41c18bae90bc3e5a0dd05438c0375ac3