Merge "msm8226: add three type subtype support"