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

Change-Id: Ic98ba55d9e005ba8b1af268dedce336fecde91ab