Merge "Initial splitting of Content Providers from AMS."