DO NOT MERGE: Check provider access for content changes.
am: ff2fede0dd

Change-Id: I7de766d1acc1f20e83f07953dedfe3810f906db8