Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd8 am: 41433459 am: 26e69188 am: ef5d2419 am: 48313052 am: 938649a1 -s ours"