Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd8 am: 41433459 am: 26e69188 am: ef5d2419 am: 29c335ef am: 01f9f1be -s ours"