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