Merge changes I25d71ed5,I84712ce9

* changes:
  Move uninstall code to device side (2/n)
  Abandon sessions before and after each test (1/n)