diff --git a/android/proto.go b/android/proto.go
index 0ffb9b62a..178d54f7f 100644
--- a/android/proto.go
+++ b/android/proto.go
@@ -292,9 +292,14 @@ func Bp2buildProtoProperties(ctx Bp2buildMutatorContext, m *ModuleBase, srcs baz
 			// (or a different subpackage), it will not find it.
 			// The CcProtoGen action itself runs fine because we construct the correct ProtoInfo,
 			// but the FileDescriptorSet of each proto_library might not be compile-able
-			if pkg != ctx.ModuleDir() {
+			//
+			// Add manual tag if either
+			// 1. .proto files are in more than one package
+			// 2. proto.include_dirs is not empty
+			if len(SortedStringKeys(pkgToSrcs)) > 1 || len(protoIncludeDirs) > 0 {
 				tags.Append(bazel.MakeStringListAttribute([]string{"manual"}))
 			}
+
 			ctx.CreateBazelTargetModule(
 				bazel.BazelTargetModuleProperties{Rule_class: "proto_library"},
 				CommonAttributes{Name: name, Dir: proptools.StringPtr(pkg), Tags: tags},
diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go
index 28dbf7ead..05d2e6aec 100644
--- a/bp2build/cc_library_conversion_test.go
+++ b/bp2build/cc_library_conversion_test.go
@@ -4965,6 +4965,7 @@ cc_library_static {
 		}),
 		MakeBazelTarget("proto_library", "foo_proto", AttrNameToString{
 			"srcs": `["foo.proto"]`,
+			"tags": `["manual"]`,
 		}),
 		MakeBazelTarget("cc_lite_proto_library", "foo_cc_proto_lite", AttrNameToString{
 			"deps": `[
@@ -5033,6 +5034,7 @@ cc_library_static {
 		MakeBazelTarget("proto_library", "foo_proto", AttrNameToString{
 			"srcs":                `["foo.proto"]`,
 			"strip_import_prefix": `""`,
+			"tags":                `["manual"]`,
 		}),
 		MakeBazelTarget("cc_lite_proto_library", "foo_cc_proto_lite", AttrNameToString{
 			"deps": `[
@@ -5103,6 +5105,7 @@ cc_library_static {
 		}),
 		MakeBazelTarget("proto_library", "foo_proto", AttrNameToString{
 			"srcs": `["foo.proto"]`,
+			"tags": `["manual"]`,
 		}),
 		MakeBazelTarget("cc_lite_proto_library", "foo_cc_proto_lite", AttrNameToString{
 			"deps": `[":foo_proto"]`,