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

Change-Id: I90cec2b594652f98a5c4a2a1b042344efb00b744