Merge "Bug 6050 - TcpSrcCodec is not maskable"