Merge "update structure of TcpInfo" am: 67ab467166 am: f4d4f6da56 am: ac13f63931

Change-Id: I8c386bb882aa7407766a0a3adc9e097d8caa2803