diff --git a/lib/ClangImporter/SwiftDeclSynthesizer.cpp b/lib/ClangImporter/SwiftDeclSynthesizer.cpp
index 1fe17c97de279..69a67dde67ec0 100644
--- a/lib/ClangImporter/SwiftDeclSynthesizer.cpp
+++ b/lib/ClangImporter/SwiftDeclSynthesizer.cpp
@@ -3183,9 +3183,7 @@ FuncDecl *SwiftDeclSynthesizer::makeAvailabilityDomainPredicate(
       BuiltinIntegerType::get(1, ctx), ImporterImpl.ImportedHeaderUnit);
   funcDecl->setBodySynthesizer(synthesizeAvailabilityDomainPredicateBody,
                                (void *)var);
-  funcDecl->setAccess(AccessLevel::Public);
-  funcDecl->addAttribute(
-      new (ctx) ExportAttr(ExportKind::Implementation, /*IsImplicit=*/true));
+  funcDecl->setAccess(AccessLevel::Internal);
 
   ImporterImpl.availabilityDomainPredicates[var] = funcDecl;
 
diff --git a/test/Availability/Inputs/AvailabilityDomains.h b/test/Availability/Inputs/AvailabilityDomains.h
new file mode 100644
index 0000000000000..233d3decc644e
--- /dev/null
+++ b/test/Availability/Inputs/AvailabilityDomains.h
@@ -0,0 +1,33 @@
+#ifndef __AVAILABILITY_DOMAIN_TEST_H
+#define __AVAILABILITY_DOMAIN_TEST_H
+
+#include <availability_domain.h>
+
+int dynamic_domain_pred();
+
+CLANG_ENABLED_AVAILABILITY_DOMAIN(EnabledDomain);
+CLANG_DISABLED_AVAILABILITY_DOMAIN(DisabledDomain);
+CLANG_DYNAMIC_AVAILABILITY_DOMAIN(DynamicDomain, dynamic_domain_pred);
+
+#define AVAIL 0
+#define UNAVAIL 1
+
+__attribute__((availability(domain : EnabledDomain, AVAIL))) void
+available_in_enabled_domain(void);
+
+__attribute__((availability(domain : EnabledDomain, UNAVAIL))) void
+unavailable_in_enabled_domain(void);
+
+__attribute__((availability(domain : DisabledDomain, AVAIL))) void
+available_in_disabled_domain(void);
+
+__attribute__((availability(domain : DisabledDomain, UNAVAIL))) void
+unavailable_in_disabled_domain(void);
+
+__attribute__((availability(domain : DynamicDomain, AVAIL))) void
+available_in_dynamic_domain(void);
+
+__attribute__((availability(domain : DynamicDomain, UNAVAIL))) void
+unavailable_in_dynamic_domain(void);
+
+#endif // __AVAILABILITY_DOMAIN_TEST_H
diff --git a/test/Availability/availability_custom_domains_clang_serialization.swift b/test/Availability/availability_custom_domains_clang_serialization.swift
new file mode 100644
index 0000000000000..e6d3a8da24e24
--- /dev/null
+++ b/test/Availability/availability_custom_domains_clang_serialization.swift
@@ -0,0 +1,43 @@
+// REQUIRES: swift_feature_CustomAvailability
+// RUN: %empty-directory(%t/mod)
+// RUN: %target-swift-frontend -emit-module %s -o %t/mod/Foo.swiftmodule -parse-as-library -enable-library-evolution -module-name Foo -import-bridging-header %S/Inputs/AvailabilityDomains.h -enable-experimental-feature CustomAvailability -D FOO
+// RUN: %target-swift-frontend -emit-module %s -o %t/mod/Bar.swiftmodule -parse-as-library -enable-library-evolution -module-name Bar -import-bridging-header %S/Inputs/AvailabilityDomains.h -enable-experimental-feature CustomAvailability -I %t/mod -D BAR
+
+#if FOO
+
+@available(DynamicDomain)
+public struct X {
+    public init() { }
+}
+
+public struct Z {
+    public init() {
+        if #available(DynamicDomain) {
+            print("#available")
+            print(X())
+        } else {
+            print("#unavailable")
+        }
+    }
+}
+
+#endif
+
+#if BAR
+
+import Foo
+
+public struct Y {
+    init() {
+        if #available(DynamicDomain) {
+            print("#available")
+            print(X())
+            print(Z())
+        } else {
+            print("#unavailable")
+            print(Z())
+        }
+    }
+
+}
+#endif
\ No newline at end of file
diff --git a/test/SILGen/availability_query_custom_domains_clang.swift b/test/SILGen/availability_query_custom_domains_clang.swift
index b3272fa000166..c13e3b92cc4a1 100644
--- a/test/SILGen/availability_query_custom_domains_clang.swift
+++ b/test/SILGen/availability_query_custom_domains_clang.swift
@@ -101,7 +101,7 @@ public func testIfAvailableDynamicDomain() {
 }
 // CHECK: end sil function '$s4Test28testIfAvailableDynamicDomainyyF'
 
-// CHECK-LABEL: sil non_abi [serialized] [ossa] @$sSC33__swift_DynamicDomain_isAvailableBi1_yF : $@convention(thin) () -> Builtin.Int1
+// CHECK-LABEL: sil hidden [ossa] @$sSC33__swift_DynamicDomain_isAvailableBi1_yF : $@convention(thin) () -> Builtin.Int1
 // CHECK: bb0:
 // CHECK:   [[QUERY_FUNC:%.*]] = function_ref @$sSo27__DynamicDomain_isAvailableSbyFTo : $@convention(c) () -> Bool
 // CHECK:   [[QUERY_RESULT:%.*]] = apply [[QUERY_FUNC]]() : $@convention(c) () -> Bool