Merge "msm_serial_hs_lite: Use aliases for setting line number"