Merge branch 'hisi-fixes'