[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 840bb2ea6f am: ec9291dea8 -s ours am: 3330938849 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 1c0d43fc15 is in history
Change-Id: I534a3ce679c438944ebaceb53419a99048cecc8f
This commit is contained in: