Merge change 27212 into eclair

* changes:
  Fix the build.