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

* commit '8c2fb1f3de20ffd00b5704994536353d56cd5b6f':
  adb: remove superfluous checks.