Merge "msm8974: Add/Correct missing UCM entries"