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

Change-Id: Icd9033ce7e32d5bddc9d0eba38b3b381fe424004