Merge "iptables: Change locking semantics." am: 7ce69df55d am: 850b49ca1f
am: 822ce832c7

Change-Id: I6d8a9556ea29dee8d6d48a28dc4131a63edd9ea7