Merge branch 'mediatek-fixes'