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

Change-Id: I450b9b7eff674f83b326ba3e2a0a894a7eb0b5c2