Merge changes I19dc0adf,Ica510099

* changes:
  More error messages for device operations (4/n)
  More descriptive test phase names (3/n)