Merge "Remove "Do not translate" for Wi-Fi security types"