DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457 am: 94b6048c4a
am: 8d9cb505d5  -s ours

Change-Id: I39803911a8f10f0c73a93473d3b9dc67ca185065