Merge "Nat464Xlat: internal state guards cleanup + state enum" am: aee703e7e4
am: 20d4df8cc1

Change-Id: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6