Merge "msm: 8064: Add machine records for cdp, mtp and liquid." into msm-3.0