Backport changes for SNAT from mainline to R1.10

Change-Id: I4498ff8bad100dab4475147a5eedcf15e1272c38
Merge "Backport changes for SNAT from mainline to R1.10" into R1.10