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

Change-Id: I1829678dd0071d4d9c51ec69d15b4975530000a8