Merge "Correct namespace for frp_enforcement flag." into main