Merge "hwc: Fix klockwork errors"