Merge "Freeze wifi 1.1 interface." into oc-dr1-dev
am: 34c42877fb

Change-Id: I3ac62dcf6c3e84eb7bd2c332dfdf928e3c567672