Merge "Remove MessageUtils usage in VpnTransportInfo"