Fix compiler warnings.
am: c151c67412

Change-Id: I5ade2daddc0db4571d2c79ceb085bdf5e5632570