Merge "Decrease MTU to account for IPv6 header"