Merge "Merge remote-tracking branch 'aosp/upstream-main' into uprev" into main
diff --git a/OWNERS b/OWNERS
index a4f788d..78b324f 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,3 +2,4 @@
 ddavenport@google.com
 jstultz@google.com
 seanpaul@google.com
+include platform/system/core:/janitors/OWNERS #{LAST_RESORT_SUGGESTION}
diff --git a/hooks/check-non-public-commits b/hooks/check-non-public-commits
index ce34e54..1e8e997 100755
--- a/hooks/check-non-public-commits
+++ b/hooks/check-non-public-commits
@@ -8,7 +8,7 @@
 
 # Don't bother checking if this is being pushed to gerrit.
 if [[ "$url" = "sso://googleplex-android/platform/external/drm_hwcomposer" ]] ||
-   [[ "$url" = "sso://android.googlesource.com/platform/external/drm_hwcomposer" ]]
+   [[ "$url" = "sso://android.googlesource.com/platform/external/drm_hwcomposer" ]] ||
    [[ "$url" = "sso://android/platform/external/drm_hwcomposer" ]]
 then
   exit 0