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: 652521ae7b
am: 292bee2f74  -s ours

Change-Id: I2be817a6f58b8bbcd050123dd987424603d702f9