am 6bfb7b64: Merge "Fix overflow in adb_client"

* commit '6bfb7b64ba857f78c0a0bcb08591003655df2b7e':
  Fix overflow in adb_client