Merge branch 'mediatek-hw-lro'