Merge "[MS33.2] Remove NetdService dependency"