Merge "Dropping NAT-T keepalive packet from APF" am: c4104f029f
am: 917c9f146b

Change-Id: Ib3416ec37f0de12daf882068e00673ad60438c1a