Merge "[AWARE] Add legacy code wrapper for NDP channel indication"