Merge "Cherry-picking the following 3 getContentProviderImpl() CLs" into pi-dev
am: 8a7d8bceb5

Change-Id: Id06664361669cdb09fcb1f37c651ce024c36e693