Merge change 24991 into eclair

* changes:
  change to use the new CALLER_IS_SYNCADAPTER flag