Merge "Use additional interface for the WiFi Aware Discovery operations." into rvc-dev