Merge "msm_shared: Fix the partition parser logic"