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

* commit '7cd3e905de4210c76efdc20a854ac8b959775b61':
  Drop <meta-data> support for DocumentsProviders.