DO NOT MERGE: Check provider access for content changes. am: 956bc433 -s ours am: 3f0e7465 am: b88d8dc5 am: b4638e2d Change-Id: Iefbb713e624ec639205d51f560045a0cb5cf3dbc