Merge "adb: remove superfluous checks." am: 8c2fb1f3de am: 68fc89d92b
am: a83913d344

* commit 'a83913d3441d7ec57639dcf40bfd5fccf73fe9df':
  adb: remove superfluous checks.