Merge "Remove Wifi Badges from platform." into oc-dev
am: 09d06437ad

Change-Id: Ie5150009258a7bccfdf222bf21329722e1e20589