pulling over a couple changes from content-provider branch