DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27  -s ours am: e0fe3201cb am: 8165a22f53 am: 270d1c27ac am: 10cdb1130e am: 45ba8593c0
am: 736acb1073  -s ours

Change-Id: I72c690f9cb77178dacb78abe8754eb5656b352e5