Merge "fix infinite loop in enableModem TC"