Merge "Remove HBM logic from the UDFPS overlay" into sc-dev