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

Change-Id: I2cb165fab892f3206fbdf03a14796ea721c2a2a8