am d586e356: Merge "Fix build."

* commit 'd586e356526b77d3d64d4d247cd8f8e0871824d5':
  Fix build.