am d966eebf: Merge "Fix build."

* commit 'd966eebfcba313477a598ad7b3e573a123a7a9af':
  Fix build.