Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e  -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be am: 5fafe8ea7c
am: f923e8c06f  -s ours

Change-Id: Icd8cf530943f0acaa6fe55a3f5a7b8668a48adff