Merge "[DO NOT MERGE] Revert "Reference unreachable netId from INetd""