am 3c93c692: am 06d2128f: Merge "Support the full length of USB serial numbers."

* commit '3c93c692054b762f00cc8d614e0ec31b0d4165bf':
  Support the full length of USB serial numbers.