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

Change-Id: I36a6cf33803635becf8ff794bb8f4e02ba5cd1d4