Merge "Fix dependency issues for PowerHAL FMQ imports" into main