Merge "msm: Give explicit name spaces to memory devices" into msm-3.0