Merge "Clean MtpManagerTest code."