DO NOT MERGE: Check provider access for content changes. am: 956bc433dc  -s ours
am: 3f0e7465cb

Change-Id: Iaa85b6d22c436ff2c46eafe500a74448403c5886