am 9b16f7db: am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit '9b16f7db5c1bd9ed515b018072f67173e1d2072d':
  Fix overflow in adb_client