Merge "Fix NPE in MtpDocumentsProviderTests"