Merge "Network Service Discovery test: properly release resources" am: c9d24d20 am: 80e0daa8 am: f467db29 am: 84b253b0 Change-Id: Icd9033ce7e32d5bddc9d0eba38b3b381fe424004