Merge "Disable test 961-default-iface-resolution-generated with gcstress" am: 677466054e am: 5f9d24ac79
am: 14d37b0571

* commit '14d37b05712d00cc44fb9bcc77bb5d8346837044':
  Disable test 961-default-iface-resolution-generated with gcstress