Merge "msm_serial_hs: Squashed commit of updates from CAF" into cm-10.1