Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b13 -s ours am: ce477912 Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0