Merge changes from topic "nat64"
am: 868f0589c8

Change-Id: I3f7f74c197dd5da3db7d8d41fa4a26aacf38c2e8