Merge "[MS33.1] Remove NetdService dependency"