Handle multi-packet TCP queries

Change-Id: Ia85db4a5d9ba4e57423f34e99e3fb7b299b3d796