Merge "Change annotation for Wifi Aware API" into sc-dev