Merge "Add infrastructure for accessing "unstable" content providers." into jb-dev