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

Change-Id: I57b4bfb5a5c928a961659a5daf8f16d54957d319