Revert "d2: Squashed revert of msm_serial_hs.c updates"