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

Change-Id: I1a19e6fbb0cb13262e90b171d861062469078fb6