Fix concurrency issue for the SNAT

Change-Id: I8e28527de44453732129c03d939d4988f2161c3a
Merge "Fix concurrency issue for the SNAT"