Merge "msm: Add support for multiple memory holes"