Merge "defconfig: 9615: Enable GPT partition" into msm-3.0