Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934 am: 21d36dcc am: ff703a3f am: dc4cbfa1 -s ours"