Merge "[AWARE] Add NDP channel info to HAL 1.2"