Merge "Adjust MTU to compensate for VLAN tag issue"