Merge "Use public API Network#getNetId() to get netid" into sc-dev