Merge "[AWARE] Implement custom Wi-Fi Aware network specifier" into oc-dev