Merge "Revert "Delete HWC1""