Merge "Restrict changing wi-fi networks" into oc-dr1-dev