DO NOT MERGE: Check provider access for content changes. am: 11e3e52b am: bdfb26ac am: ad04786a am: 9e7bd594 am: 0040d4f7 Change-Id: I3ba82865bee69b527ebeb9bcfdd2b9883925a5ca