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

* commit 'fef53b7ecd114e5e6ccf7fe804ee323bd1a1abf2':
  Fix overflow in adb_client