am 8e012107: Merge "Fix the build"

* commit '8e01210767493ceb8f264c1bef7a635f0aa32222':
  Fix the build