Merge "msm_serial_hs: Avoid potential unclocked access by clients"