diff --git a/tools/warn/java_warn_patterns.py b/tools/warn/java_warn_patterns.py
index 96510b4..c2919b0 100644
--- a/tools/warn/java_warn_patterns.py
+++ b/tools/warn/java_warn_patterns.py
@@ -461,12 +461,15 @@
                 [r".*: warning: \[WaitNotInLoop\] .+"]),
     java_medium('A wakelock acquired with a timeout may be released by the system before calling `release`, even after checking `isHeld()`. If so, it will throw a RuntimeException. Please wrap in a try/catch block.',
                 [r".*: warning: \[WakelockReleasedDangerously\] .+"]),
+    java_medium_type('AbstractInner'),
     java_medium_type('CallbackName'),
     java_medium_type('ExecutorRegistration'),
     java_medium_type('ListenerLast'),
     java_medium_type('MissingBuildMethod'),
     java_medium_type('NoByteOrShort'),
+    java_medium_type('OverlappingConstants'),
     java_medium_type('SetterReturnsThis'),
+    java_medium_type('Typo'),
     java_medium_type('UseIcu'),
     java_high('AndroidInjection.inject() should always be invoked before calling super.lifecycleMethod()',
               [r".*: warning: \[AndroidInjectionBeforeSuper\] .+"]),
diff --git a/tools/warn/make_warn_patterns.py b/tools/warn/make_warn_patterns.py
index 327fce4..dd6a1b0 100644
--- a/tools/warn/make_warn_patterns.py
+++ b/tools/warn/make_warn_patterns.py
@@ -53,6 +53,9 @@
     {'category': 'make', 'severity': Severity.MEDIUM,
      'description': 'make: please convert to soong',
      'patterns': [r".*: warning: .* has been deprecated. Please convert to Soong."]},
+    {'category': 'make', 'severity': Severity.MEDIUM,
+     'description': 'make: deprecated macros',
+     'patterns': [r".*\.mk:.* warning:.* [A-Z_]+ (is|has been) deprecated."]},
 ]
 
 
diff --git a/tools/warn/other_warn_patterns.py b/tools/warn/other_warn_patterns.py
index 19a4e38..845e2db 100644
--- a/tools/warn/other_warn_patterns.py
+++ b/tools/warn/other_warn_patterns.py
@@ -112,8 +112,16 @@
     kotlin('never used parameter or variable',
            [r".*\.kt:.*: warning: (parameter|variable) '.*' is never used$",
             r".*\.kt:.*: warning: (parameter|variable) '.*' is never used, could be renamed to _$"]),
+    kotlin('initializer is redundant',
+           [r".*\.kt:.*: warning: .* initializer is redundant$"]),
+    kotlin('elvis operator always returns ...',
+           [r".*\.kt:.*: warning: elvis operator \(\?:\) always returns .+"]),
+    kotlin('shadowed name',
+           [r".*\.kt:.*: warning: name shadowed: .+"]),
     kotlin('unchecked cast',
            [r".*\.kt:.*: warning: unchecked cast: .* to .*$"]),
+    kotlin('unnecessary safe call on a non-null receiver',
+           [r".*\.kt:.*: warning: unnecessary safe call on a non-null receiver"]),
     kotlin('Deprecated in Java',
            [r".*\.kt:.*: warning: '.*' is deprecated. Deprecated in Java"]),
     kotlin('library has Kotlin runtime',