Fix compiler warnings. am: c151c67412
am: c0402548cd

Change-Id: I17a3e5063c58992d69835a9af41b5fb9d72e61bf