Merge "Refine network-related commands porting" am: 82696f8e4c
am: 3c78330edb

Change-Id: Ia99dccc6b705c6e096c559bc04e266393320aa01