DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: 0af2fdee40
am: a5b6631392  -s ours

Change-Id: I7a95ca3a057bebce4fe1c704edbddbc41bb542b2