Merge "Handle proxy-based TLS when placed in front of Swift"