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

Change-Id: Iaa2e76ad70e68ea1457604b274b35a0978b34bff