Merge branch 'r8152-fixes'