Merge "[Aware] Fix issue when multiple NDP request" into sc-dev