Merge "CTS-V Migration Wi-Fi Aware (Add utility functions for Wi-Fi Aware setup)" into main