Merge "msm: pil: Fix loadable segment type check" into msm-3.4