Merge "Revert "Extention API: Change Wifi score reporting behaviors bas..."" into sc-dev