[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into...
[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: ab54887a am: 3c8cebf3 -s ours am: 11b1b490 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 717992f7 is in history
Change-Id: I534a3ce679c438944ebaceb53419a99048cecc8f