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

Change-Id: I8af2c8895deb6abc89c7394809b3e2f24c41fa65