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: dd09c12a61
am: e98f3f4d08  -s ours

Change-Id: Ib7f656cbbfdfb6332583fb750444dcb974f33a5f