Merge "msm_serial_hs: Defensive checks"