Merge changes Ifc661bd2,Iba4ed7be

* changes:
  Run device tests as the shell user.
  Remove dead code.