Merge "SF: Clean up HWC validation"