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

* commit '68fc89d92b315409a8ec01e90658b48fe3100786':
  adb: remove superfluous checks.