am 875922bb: Merge "fix build."

* commit '875922bbc6e299c2a6867f0eb39c5900a6d6ae96':
  fix build.