Merge "Use ContentProviderClient Instead"