Merge "Make the Nat464Xlat tests more realistic." am: be49675e8d am: 1cfbcd12d6

Change-Id: Ib8d91c81af3d2e5d03c0fd47f415ff93fee5e2aa
tree: 5d3f1ab675f3584eda8934d6922f8fbcad6a99e8
  1. core/
  2. services/
  3. tests/