Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfc am: 471812ad am: 46108057 -s ours Change-Id: If9504039b5ec449edb2fb1e9f429a3d568a2aabf