am c09530b7: am 36ae696f: Limiting number of ContentProviderOperations per yield point.

Merge commit 'c09530b7a1f2f59f7bae0f9a14214db4b955feb6'

* commit 'c09530b7a1f2f59f7bae0f9a14214db4b955feb6':
  Limiting number of ContentProviderOperations per yield point.