Merge "Ipfwd-related commands porting"
am: 0e5b480b1b

Change-Id: I248efd9189bf752b02b93ac1743f30bc56fb05cb