DO NOT MERGE: Check provider access for content changes. am: 11e3e52b am: bdfb26ac am: ad04786a am: 9e7bd594 am: 94b6048c Change-Id: I47554fd58875360e09418af17029deb1aff0274a