Merge "Fix ConnectivityServiceTest for NATT Keepalive"
am: f6bbc21688

Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c
tree: 8a0aa488d1708a532b23a65741f238d7d2ece899
  1. core/
  2. services/
  3. tests/