diff --git a/input/virtio_input_multi_touch_1.idc b/input/virtio_input_multi_touch_1.idc
new file mode 100644
index 0000000000000000000000000000000000000000..78af51131794021496b5f28036e489a15ccc858e
--- /dev/null
+++ b/input/virtio_input_multi_touch_1.idc
@@ -0,0 +1,6 @@
+device.internal = 1
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+cursor.mode = navigation
+cursor.orientationAware = 1
+
diff --git a/input/virtio_input_multi_touch_10.idc b/input/virtio_input_multi_touch_10.idc
new file mode 100644
index 0000000000000000000000000000000000000000..47dbd42a18edf712b5f48af7e26cd288f77a0ffc
--- /dev/null
+++ b/input/virtio_input_multi_touch_10.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234570
diff --git a/input/virtio_input_multi_touch_11.idc b/input/virtio_input_multi_touch_11.idc
new file mode 100644
index 0000000000000000000000000000000000000000..a845bec7122ef22cb0e23b2b5582f77a2322f766
--- /dev/null
+++ b/input/virtio_input_multi_touch_11.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234571
diff --git a/input/virtio_input_multi_touch_2.idc b/input/virtio_input_multi_touch_2.idc
new file mode 100644
index 0000000000000000000000000000000000000000..7222cab29966e24732d896d07aa530ffdee7c03e
--- /dev/null
+++ b/input/virtio_input_multi_touch_2.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234562
diff --git a/input/virtio_input_multi_touch_3.idc b/input/virtio_input_multi_touch_3.idc
new file mode 100644
index 0000000000000000000000000000000000000000..9750e95952ba1251dd1dcbaa1c43ac2dfe39bce7
--- /dev/null
+++ b/input/virtio_input_multi_touch_3.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234563
diff --git a/input/virtio_input_multi_touch_4.idc b/input/virtio_input_multi_touch_4.idc
new file mode 100644
index 0000000000000000000000000000000000000000..8cc357e63e6b7b2ae0bbe12d43db94c2da19ef12
--- /dev/null
+++ b/input/virtio_input_multi_touch_4.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234564
diff --git a/input/virtio_input_multi_touch_5.idc b/input/virtio_input_multi_touch_5.idc
new file mode 100644
index 0000000000000000000000000000000000000000..9ceeb8bac9f796fa35b15acda5da5ee7abc51eaf
--- /dev/null
+++ b/input/virtio_input_multi_touch_5.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234565
diff --git a/input/virtio_input_multi_touch_6.idc b/input/virtio_input_multi_touch_6.idc
new file mode 100644
index 0000000000000000000000000000000000000000..f8cfb76aa5529cb9ceec32e6f0935710510f699c
--- /dev/null
+++ b/input/virtio_input_multi_touch_6.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234566
diff --git a/input/virtio_input_multi_touch_7.idc b/input/virtio_input_multi_touch_7.idc
new file mode 100644
index 0000000000000000000000000000000000000000..7147fb738c19fbd225c415a1814b4804cec4ddbb
--- /dev/null
+++ b/input/virtio_input_multi_touch_7.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234567
diff --git a/input/virtio_input_multi_touch_8.idc b/input/virtio_input_multi_touch_8.idc
new file mode 100644
index 0000000000000000000000000000000000000000..84ae7936efd9afc7a4d5a24f90c626634722816a
--- /dev/null
+++ b/input/virtio_input_multi_touch_8.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234568
diff --git a/input/virtio_input_multi_touch_9.idc b/input/virtio_input_multi_touch_9.idc
new file mode 100644
index 0000000000000000000000000000000000000000..4b1511604c9fa2257a6517a694a00df1c43ff3e4
--- /dev/null
+++ b/input/virtio_input_multi_touch_9.idc
@@ -0,0 +1,12 @@
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+
+# This displayID matches the unique ID of the virtual display created for Emulator.
+# This will indicate to input flinger than it should link this input device
+# with the virtual display.
+touch.displayId = virtual:com.android.emulator.multidisplay:1234569
diff --git a/vendor.mk b/vendor.mk
index 2d2642d1be68dda0d8d8bcaedb126a672fb6b1f2..d520d39acff1dc22ae8c8ab88e4f2b3bb069a353 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -153,6 +153,17 @@ PRODUCT_COPY_FILES += \
     device/generic/goldfish/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
     device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \
     device/generic/goldfish/input/goldfish_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/goldfish_rotary.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_1.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_1.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_2.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_3.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_3.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_4.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_4.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_5.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_5.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_6.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_6.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_7.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_7.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_8.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_8.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_9.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_9.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_10.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_10.idc \
+    device/generic/goldfish/input/virtio_input_multi_touch_11.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_multi_touch_11.idc \
     device/generic/goldfish/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml \
     device/generic/goldfish/data/etc/config.ini:config.ini \
     device/generic/goldfish/wifi/simulated_hostapd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/simulated_hostapd.conf \