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

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