Merge "Revert "Upgrade HWC from 2.1 to 2.3""