Add support for ContentProviderClient.

Closes #1008.