am dc8d7048: Merge changes I7277880e,Ia5584bd6 into klp-dev

* commit 'dc8d704899716e97e59af8b6fe5f549e0229eda6':
  Provide calling package to ContentProviders.
  Separate root and document management.