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

Change-Id: Ia8296466ffa048e8ada727f7015e74925d6098a3