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

Change-Id: I0dc6e8b142d2f4576212281f372a8917efd2e1f4