Updated cherry pick for change 383049
Updated cherry pick for change 383049

Signed-off-by: Remus Buzatu <442ca000fc34b0239b9e438dbc108749457853bd@gmail.com>

rbuzatu90/hyperv-networking-ci,rbuzatu90/hyperv-networking-ci