Merge "Drop <meta-data> support for DocumentsProviders." into klp-dev