Merge "Open network service discovery API"