Merge "Replace TcpSocketInfo with similar structure" am: a34aa2acab
am: 43411c851d

Change-Id: I8ce393e01d48d87deefc0ac9e8c041224b6d4bae