am c33e62bd: Merge "Be tolerant of devices that don\'t report serials." into mnc-dev

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