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

Change-Id: Ic463667ae6ac346f8eae4b6ca18888dcd24b9d6d