Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Contains the following commit:
b9d5bb8 qmi-device: skip version info check for QRTR device (Eric Caruso)

Change-Id: I76ee672d1b0d9867b5d0747f088f63120e56064c