Merge "Replace streams with Lists in MtpStorageManager"