Merge "Nat-related commands porting" am: 3d2b099dc0
am: 218b5f6dc0

Change-Id: I625a74e38e78fa216f0d5a92342a7ba0fe58874f