Merge changes from topic "nat64"
am: 868f0589c8

Change-Id: I3f7f74c197dd5da3db7d8d41fa4a26aacf38c2e8
tree: bfc76bbc0804753d28fbf3e122f5d22e7a9e0832
  1. core/
  2. services/
  3. tests/