Merge "Restrict WiFi network connection" into tm-dev