Merge "msm_serial_hs_lite: Decouple line number from device ID" into msm-3.0