Merge change 24990 into eclair

* changes:
  change to use the new CALLER_IS_SYNCADAPTER flag