Merge branch 'mediatek-trgmii'