[automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into...
[automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev am: 7afeb17f -s ours
am: 18803338 -s ours
am skip reason: change_id If62ba7fdb5f0f0f0a7a59ec169e82b4e3147eedd with SHA1 56f9e417 is in history
Change-Id: I8d98fbce58483962a4258b005de24072ba901318