am 9c4c5a6e: Merge "Verify token length before adb signs it"

* commit '9c4c5a6ed934490ba0fcce661594975a6f4c2c89':
  Verify token length before adb signs it