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

* commit '06d2128f8729f3349f5ba588829c6f992a793c22':
  Support the full length of USB serial numbers.