Merge "Migrate NetworkStack modules to use modules-utils" into sc-mainline-prod