Merge "msm_serial_hs: Improve error handing for SPS API usage"