Merge branch 'draft/x1_traffic_policies' into cr/103221-1/041