Merge "Refactoring of DocumentsContract." into klp-dev