Merge change 23609 into eclair

* changes:
  Fix SDK build breakage.