Merge "[AWARE] Data-path creation roles hard-coded for discovery sessions"