Merge "Fix formatting in TestIpfwdAddRemoveInterfaceForward."