diff --git a/java/sdk_library.go b/java/sdk_library.go
index ecf2b1a03..1936bf5fd 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -458,7 +458,7 @@ type sdkLibraryProperties struct {
 	Dist_stem *string
 
 	// The subdirectory for the artifacts that are copied to the dist directory.  If not specified
-	// then defaults to "android".  Should be set to "android" for anything that should be published
+	// then defaults to "unknown".  Should be set to "android" for anything that should be published
 	// in the public Android SDK.
 	Dist_group *string
 
@@ -1240,8 +1240,7 @@ func (module *SdkLibrary) distGroup() string {
 	if owner := module.ModuleBase.Owner(); owner != "" {
 		return owner
 	}
-	// TODO(b/186723288): Make this "unknown".
-	return "android"
+	return "unknown"
 }
 
 func (module *SdkLibrary) latestApiFilegroupName(apiScope *apiScope) string {
diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go
index 0fe6e72ef..f0f3a197f 100644
--- a/java/sdk_library_test.go
+++ b/java/sdk_library_test.go
@@ -888,7 +888,7 @@ func TestJavaSdkLibraryDist(t *testing.T) {
 	testCases := []testCase{
 		{
 			module:   "sdklib_no_owner",
-			distDir:  "apistubs/android/public",
+			distDir:  "apistubs/unknown/public",
 			distStem: "sdklib_no_owner.jar",
 		},
 		{
@@ -903,7 +903,7 @@ func TestJavaSdkLibraryDist(t *testing.T) {
 		},
 		{
 			module:   "sdklib_stem_foo",
-			distDir:  "apistubs/android/public",
+			distDir:  "apistubs/unknown/public",
 			distStem: "foo.jar",
 		},
 		{