Merge "msm: Rename pmem variables and macros" into msm-3.4