Merge "msm: lpm: lpm resources bug fixes" into msm-3.4