DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 am: d8ee1d0fcd
am: b155106933  -s ours

Change-Id: I128c5baee4f0f4d754467f4f718c5d55c0bc7020