Merge "Make the Nat464Xlat tests more realistic." into rvc-dev am: 840bb2ea6f

Change-Id: I733c6565f93a6ab7e19b39f86a3c90837cfa4485
tree: c28cb1a70dea7f866bc7b3e0f40fc15c71d51d2f
  1. core/
  2. services/
  3. tests/