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

Change-Id: Iabd9c24ed2d948b02f0ddeef20571e4df292bc98