Merge changes Ic8ff7f34,Ibe4ba3d6

* changes:
  Enable MS OS descriptors for adb.
  Remove uses of sprintf.