DO NOT MERGE: Check provider access for content changes. am: c813f5dae2 am: 2b7584f5b1 am: 37d3eecbac
am: 1fb6b55178  -s ours

Change-Id: If4048fee4befc1073db9a195dc0d7795b0272bee