Merge "fix infinite loop in enableModem TC" into tm-dev