Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04
am: 4610805746  -s ours

Change-Id: If9504039b5ec449edb2fb1e9f429a3d568a2aabf