Merge "Remove dependency on libnetd_client"