[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into...
[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: ab54887a -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 0a9b1b6a is in history
Change-Id: Ib62c56f16ad3df8a98038271ea5d57e0ed189192