Merge "HWC2: Fix breakage from header change" into nyc-dev