Cherry-pick b0fe4d9b411adc62e2711d458347608a2cff8ab9 into nova-network/v4.2.2rc