[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 6a3e78a97d am: 02a3cb88e4 -s ours am: a186c73174 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 e0084efb28 is in history
Change-Id: I534a3ce679c438944ebaceb53419a99048cecc8f
This commit is contained in: