DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d am: 9e7bd59457
am: 0040d4f71c

Change-Id: I3ba82865bee69b527ebeb9bcfdd2b9883925a5ca