DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0
am: 4ad177829a -s ours
Change-Id: I946f7bab2f86d26c23460cc5664d901f4f8fff06
This commit is contained in: