Merge "[MULTICLOUD] Service mesh compatibility"