Merge "Explicitly export content providers" into jb-mr1-dev