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

Change-Id: I47554fd58875360e09418af17029deb1aff0274a