Merge "[AWARE] Add Wi-Fi Aware-specific Network info: port, transport protocol"