Merge "Fix NPE in getContentProviderImpl"