DO NOT MERGE: Check provider access for content changes. am: 956bc433dc  -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88
am: bf9a60106b

Change-Id: I8c9cb10bfc49c49fe51512dbc9242c94820d474e