Merge change 23103 into eclair

* changes:
  Fixing the build.