Merge "Fix possible integer overflow in MtpStorage"