am 2ed09d44: Merge "Fix build."

* commit '2ed09d44ecdaf656a598052d155a813897239042':
  Fix build.