[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 am: 3cbf1a64 am: 91473f96 -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 717992f7 is in history
Change-Id: I470b9842d0b476edcefea7f1d6e273788bd69885