network-refactor merge: fix nonoss build

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>