diff --git a/apex/builder.go b/apex/builder.go
index 5d5d1ab..50c8dd1 100644
--- a/apex/builder.go
+++ b/apex/builder.go
@@ -617,7 +617,7 @@
 		}
 
 		// Create a NOTICE file, and embed it as an asset file in the APEX.
-		a.htmlGzNotice = android.PathForModuleOut(ctx, "NOTICE/NOTICES.html.gz")
+		a.htmlGzNotice = android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
 		android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, a.htmlGzNotice)
 		implicitInputs = append(implicitInputs, a.htmlGzNotice)
 		optFlags = append(optFlags, "--assets_dir "+filepath.Dir(a.htmlGzNotice.String()))
diff --git a/java/app.go b/java/app.go
index 573b9ec..5b1daa4 100755
--- a/java/app.go
+++ b/java/app.go
@@ -586,7 +586,7 @@
 	}
 	a.onDeviceDir = android.InstallPathToOnDevicePath(ctx, a.installDir)
 
-	noticeFile := android.PathForModuleOut(ctx, "NOTICES.html.gz")
+	noticeFile := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
 	android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile)
 	if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") {
 		a.aapt.noticeFile = android.OptionalPathForPath(noticeFile)