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

Change-Id: I38970ecc2ee43591ec43768284eb51b3226536e2