Merge "Nat464Xlat: clat management cleanup" am: 81b179cfdd am: b6805dc02f
am: da71487a59

Change-Id: I06661bd6bd1456ba34a3bbdb52c120ac01da9d61