Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev