Merge "msm8974: Correct UCM entries CDP, fluid."