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

Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85