am 6607275b: am 9fd81a90: Merge "Stronger DocumentsProvider contract." into klp-dev

* commit '6607275b3a99b28f4176f8f8cc87f46c5ed051db':
  Stronger DocumentsProvider contract.