Merge "msm_serial: Fix the timing requirement for UIMs" into msm-3.4