Merge "Freeze wifi 1.1 interface." into oc-dr1-dev