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