Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev