Merge "Support NAT keepalives" am: 6c7c55206d am: 5c8c836bc4
am: 5c1ebdd5c3  -s ours

Change-Id: I43425c7a90afa8193713c5ae201d309640cc89f5