Merge change 25291 into eclair

* changes:
  Try to fix sdk build again.