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

Change-Id: Ifccff9f3cfccdb2cdddf2f07561f0787a48bc0f8