Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev
am: 584406f8e1  -s ours

Change-Id: Ib9a20c7caf8a86a0611c9c91a4b0024686e3f5e9