Merge "New ContentProvider initialization for testing." into jb-mr2-dev