Merge "Remove Wifi Badges from platform." into oc-dev