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

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