DO NOT MERGE: Check provider access for content changes. am: 4ddbf942 am: 190e20c2 am: 74b36307 am: 4ad17782 -s ours Change-Id: I946f7bab2f86d26c23460cc5664d901f4f8fff06