diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index c5d158c11b..32104faddc 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -38,7 +38,4 @@ config HAVE_ME_BIN
 	bool
 	default n
 
-# TODO: Remove this when platform ASL is fixed
-config IASL_WARNINGS_ARE_ERRORS
-	def_bool n
 endif # BOARD_GOOGLE_RAMBI
diff --git a/src/mainboard/google/rambi/acpi/mainboard.asl b/src/mainboard/google/rambi/acpi/mainboard.asl
index 7bd9aa1e6d..7236c93dff 100644
--- a/src/mainboard/google/rambi/acpi/mainboard.asl
+++ b/src/mainboard/google/rambi/acpi/mainboard.asl
@@ -52,10 +52,13 @@ Scope (\_SB)
 
 		Method (_CRS)
 		{
-			/* Only return interrupt if I2C1 is PCI mode */
+			/* Return interrupt if I2C1 is PCI mode */
 			If (LEqual (\S1EN, 0)) {
 				Return (^RBUF)
 			}
+
+			/* Return empty resource template otherwise */
+			Return (ResourceTemplate() {})
 		}
 	}
 
@@ -76,10 +79,13 @@ Scope (\_SB)
 
 		Method (_CRS)
 		{
-			/* Only return interrupt if I2C6 is PCI mode */
+			/* Return interrupt if I2C6 is PCI mode */
 			If (LEqual (\S6EN, 0)) {
 				Return (^RBUF)
 			}
+
+			/* Return empty resource template otherwise */
+			Return (ResourceTemplate() {})
 		}
 	}
 }