am d57d710f: Merge "Fix build (take two)."

* commit 'd57d710f0847009038297d1ffcc1613198fb48d4':
  Fix build (take two).