am 26ae7db4: Merge "Fix build."

* commit '26ae7db48d94c7247e1faef9cfc08c85097b9ba3':
  Fix build.