Merge "Remove NetdService, NetworkStackClient dependency" into sc-dev