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

Change-Id: I0e547bc11fb16e8845463e1ccb57877623a24e99