Fix compiler warnings. am: 666b76bf84 am: 7c9b5f0978
am: 336d420bff

Change-Id: I1fe838be22446fe462b174f5b748364acd8e65bd