Merge "Fix getContentProviderImpl() permission issue"