Merge changes I65974f90,I98015097

* changes:
  Clean up some of the Content Provider code.
  Reorganize some of the ContentProvider methods.