Merge "Remove redundand code from TestMtpManager."