Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9
am: 17d6ba41b8

Change-Id: Idb7d2abaaf9809afd070e012dca6988ced2bf22c