Merge "Fix multicast scenario test"