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

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