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

Change-Id: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00