am 53c8f8b8: am 875922bb: Merge "fix build."

* commit '53c8f8b81b82cc0c6476a08606971d0405c5364b':
  fix build.