Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev