Merge "hwc: Fix warning messages."