  #!/usr/bin/env python3
  import time
  import threading
  import _thread
  import signal
  import sys
  
  import cereal.messaging as messaging
  from common.params import Params
  import selfdrive.manager as manager
 
</s> remove import selfdrive.manager as manager
 </s> add  </s> remove from selfdrive.version import training_version
 </s> add from selfdrive.version import training_version, terms_version
  #!/usr/bin/env python3
  import time



  import sys
  
  import cereal.messaging as messaging
  from common.params import Params
  import selfdrive.manager as manager
keep keep replace replace replace keep keep keep keep keep
 Improve CPU usage test reliability (#2002)

* run phone tests in parallel

* better cpu test

* re-enable test

* no root

* terms version

* not one

* yes

* debug

* that's coverd by min cpu percent 
selfdrive/test/test_cpu_usage.py