am 16ac3c32: am 19792a66: Merge "Be tolerant of devices that don\'t report serials."

* commit '16ac3c327944acd5f6c8ffbdbc474e7931daa3be':
  Be tolerant of devices that don't report serials.