Merge "Fix new Wi-Fi strings from Developer Options"