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

* commit '42f058f7e867ccb7b3a3dc955b83ee6e236c031f':
  Verify token length before adb signs it