Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e  -s ours
am: b685f719f1

Change-Id: If5744f0e5554877450b5e75f304fe857366de72c