Merge "Fix API test for external subnet visibility"