Merge change 23499 into donut

* changes:
  Fix content provider