am 37c5cd6e: Merge "Fix the build."

* commit '37c5cd6ee960804afa9a78910f1d3a7bd1963a78':
  Fix the build.