Merge "Annotation changes for SDK dependent Wi-Fi APIs" into sc-dev