Merge changes from topic "nat64" am: a02847ec0d am: d9b7731230
am: 6f8dd4a6ad

Change-Id: Iffd1a988d631c9285bad232cc60ae321abc866e8