Merge changes I7277880e,Ia5584bd6 into klp-dev

* changes:
  Provide calling package to ContentProviders.
  Separate root and document management.