am f746cd9b: Merge "Fix build."

* commit 'f746cd9bb573b6b4b8c6dcdcf819c0203a186822':
  Fix build.