[automerger skipped] Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: ab54887a75 -s ours am: 8210bea55f -s ours am: bb8830f22d -s ours
am skip reason: Change-Id I41766e9adaa7c24454648b371e6e3cc647693be5 with SHA-1 0a9b1b6a4b is in history
Change-Id: I46755f44a36489590d51008245625f204ca1933c
This commit is contained in: