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

* commit '2e3d1529348438f890a2bbbb7e7c33bf7937d394':
  Fix overflow in adb_client