Merge "Fix tests in MtpDocumentsProvider."