Merge "msm: rpm-8930: Fix incorrect RPM enumeration and DMM" into msm-3.4