Merge branch 'hsw/pmu5' into hle39/combined