Merge "Make the Nat464Xlat tests more realistic." am: be49675e8d

Change-Id: I6a611b7fd7199d8c91baca39e04749ad8852a42e
tree: 0da8feba456c05f462ed3ded33da8fa341b93e2f
  1. core/
  2. services/
  3. tests/