am 33a0ade1: am 4eef72bd: Merge "Fix compiler warnings."

* commit '33a0ade1f2bd0aabd29ff34ba62a10b3ad45c962':
  Fix compiler warnings.