DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours
am: c067e76bba

Change-Id: I36e17906c43408126d1acabde89bf7ec04e16aab