Merge "msm: cleanup and minor fixes for PFT driver"