am 4df901a4: am 7cd3e905: Merge "Drop <meta-data> support for DocumentsProviders." into klp-dev

* commit '4df901a40c5529aee9f5ef4d3b81fdf090b3d57a':
  Drop <meta-data> support for DocumentsProviders.