Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev