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

Change-Id: I1812de0dd036142fae97145361fdf5da50e61536