am 4eef72bd: Merge "Fix compiler warnings."

* commit '4eef72bdf5fd83e7361fb11feaf5a40121ede03f':
  Fix compiler warnings.