am 8a3ec796: Merge "Fix overflow in adb_client"

* commit '8a3ec7964d24a4e156ef7124afca59524a773c49':
  Fix overflow in adb_client