Merge "Disable test 961-default-iface-resolution-generated with gcstress"