Merge "Nat464Xlat: correct racefree teardown" am: e6793f2795
am: a1af47b6ad

Change-Id: Icb2dc8229b5ea45e319233b588f2dbe39ea40d4c