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

Change-Id: I7b752d76de85f13b0575972271bdca062f86e4d9