[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d -s ours

am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 1076d22c37 is in history

Change-Id: Ib62c56f16ad3df8a98038271ea5d57e0ed189192
tree: cda2f49d8628181de3eb6dd2f934d91e1e01f932
  1. core/
  2. services/
  3. tests/