am c3936f3b: merge from open-source master

Merge commit 'c3936f3b2fcad77947266c18c7e7ac83aba35339' into kraken

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