Fix ContentProvider support.