am f7e148c1: merge from open-source master

Merge commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9' into kraken

* commit 'f7e148c1bc482fe7f8df49d216b1f9390f0638b9':
  adb connect and disconnect improvements: