Merge "msm: gsi: add support for NOP xfers" into msm-4.9