Merge "[AWARE] Clarify semantics of service discovery parameters"