am 9ad66541: Merge "New ContentProvider initialization for testing." into jb-mr2-dev

* commit '9ad665417713398524d425f63b0d6fa751244237':
  New ContentProvider initialization for testing.