Merge "Make test 971-iface-super smaller to prevent gcstress timeouts."