Merge "VTS: Restore 2nd-IMEI tests"