Merge change 22537 into eclair

* changes:
  Fix build.