Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce am: 21d36dcc91
am: ff703a3fd0

Change-Id: Ie3a7b042909fcbb0f02d7acc590d431729e5cc31