Merge "Enable optimizer on service-connectivity"