Merge "DO NOT MERGE: Check provider access for content changes. am: 956bc433 -s ours am: 3f0e7465 am: b88d8dc5 am: b4638e2d am: bf9a6010 am: 1afc4b84 am: d40f62ea -s ours"