Merge "Do not count dropped packet on egress side"