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

Change-Id: Id180a71daf27e263625b12d93801d63c4789e9bd