Merge "msm: Bug fixes in lpm_resources and mpm" into msm-3.4