Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
am: fdef2cd87d

Change-Id: Ie6f22b55f9bb934f93d7821e362163bbdbc71753