Merge "Network Service Discovery test: properly release resources" am: c9d24d203d
am: 80e0daa870

Change-Id: I03c0cff6dfdcd8dfc94de8399161ceab0f7a901a