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

Change-Id: I46ccdd4afba9b3138397a8536d753e2819d94995