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

Change-Id: Ifc1f44863808d0e8f8ab33e5aa757930e27578fe