Merge "Retire hwc2"