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