Merge "Add ApfConstants for ND offload" into main