Merge changes from topic 'iptables-1.6.1' am: c784fc47e6 am: ff45753ae3
am: e20d6bf62b

Change-Id: I7f42039a088b89201367df2b0a926fcd88987776