Merge "[KA07] Drop TCP keepalive ack packets"
am: 6110472c77

Change-Id: I8294b49aa5a7a6f24996a697ca9f26b2f8179357