am cd6d7dee: Merge "Refactoring of DocumentsContract." into klp-dev

* commit 'cd6d7deec8742e257a670db8e027f628afdf337e':
  Refactoring of DocumentsContract.