[neutron] Recent incompatible change in stable/rocky branch