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

Change-Id: I59845d27d897e3c7e8e4c82b01cab6bc1fbf70bf