Merge "Add additional SystemApi for NetworkStack"