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