Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev...

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b13  -s ours am: ce477912 am: 920b02a9  -s ours am: aff9286b am: 37ff2d56 am: 56247334 am: 923aef8e  -s ours am: f199d511 am: 1d752340 am: 4aacfce7 am: 5b64f51a am: 6fa7e324
am: 5100194f  -s ours

Change-Id: Ic9fa83c273adf160cebe7517c3ddfc905150553c