[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: c2af11cf -s ours
am skip reason: change_id If62ba7fdb5f0f0f0a7a59ec169e82b4e3147eedd with SHA1 95538d2d is in history
Change-Id: I68ce3aa589cc926a1c92ea9c932bf3f54974b001