Merge "Polish MtpManagerTest."