Merge change 25132 into eclair

* changes:
  fix ContentProviderOperationTest