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

Change-Id: If00e3170722626fa959ec16bde1a1905ae45ccbf