Merge "Verify token length before adb signs it"