diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 97c1b33..452c575 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -33,10 +33,14 @@
 endef
 
 ##########################################
-# We may only afford small font footprint.
+# The following fonts are distributed as symlink only.
 ##########################################
 $(eval $(call create-font-symlink,DroidSans.ttf,Roboto-Regular.ttf))
 $(eval $(call create-font-symlink,DroidSans-Bold.ttf,Roboto-Bold.ttf))
+$(eval $(call create-font-symlink,DroidSerif-Regular.ttf,NotoSerif-Regular.ttf))
+$(eval $(call create-font-symlink,DroidSerif-Bold.ttf,NotoSerif-Bold.ttf))
+$(eval $(call create-font-symlink,DroidSerif-Italic.ttf,NotoSerif-Italic.ttf))
+$(eval $(call create-font-symlink,DroidSerif-BoldItalic.ttf,NotoSerif-BoldItalic.ttf))
 
 ################################
 # On space-constrained devices, we include a subset of fonts:
@@ -45,14 +49,6 @@
 extra_font_files := DroidSans.ttf DroidSans-Bold.ttf
 else
 include $(CLEAR_VARS)
-LOCAL_MODULE := DroidSansEthiopic-Regular.ttf
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT)/fonts
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := MTLmr3m.ttf
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 LOCAL_MODULE_CLASS := ETC
@@ -64,7 +60,6 @@
 extra_font_files := \
 	DroidSans.ttf \
 	DroidSans-Bold.ttf \
-	DroidSansEthiopic-Regular.ttf \
 	MTLmr3m.ttf
 endif  # SMALLER_FONT_FOOTPRINT
 
@@ -102,10 +97,6 @@
     Roboto-Bold.ttf \
     Roboto-Italic.ttf \
     Roboto-BoldItalic.ttf \
-    DroidSerif-Regular.ttf \
-    DroidSerif-Bold.ttf \
-    DroidSerif-Italic.ttf \
-    DroidSerif-BoldItalic.ttf \
     DroidSansMono.ttf \
     Clockopia.ttf \
     AndroidClock.ttf \
@@ -135,12 +126,6 @@
     RobotoCondensed-BoldItalic.ttf \
     RobotoCondensed-Light.ttf \
     RobotoCondensed-LightItalic.ttf \
-    DroidNaskh-Regular.ttf \
-    DroidNaskhUI-Regular.ttf \
-    DroidSansHebrew-Regular.ttf \
-    DroidSansHebrew-Bold.ttf \
-    DroidSansArmenian.ttf \
-    DroidSansGeorgian.ttf \
     AndroidEmoji.ttf
 
 endif # !MINIMAL_FONT
diff --git a/data/fonts/DroidNaskh-Bold.ttf b/data/fonts/DroidNaskh-Bold.ttf
deleted file mode 100644
index 14d8768..0000000
--- a/data/fonts/DroidNaskh-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidNaskh-Regular.ttf b/data/fonts/DroidNaskh-Regular.ttf
deleted file mode 100644
index 03662f2..0000000
--- a/data/fonts/DroidNaskh-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidNaskhUI-Regular.ttf b/data/fonts/DroidNaskhUI-Regular.ttf
deleted file mode 100644
index c961de2..0000000
--- a/data/fonts/DroidNaskhUI-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansArabic.ttf b/data/fonts/DroidSansArabic.ttf
deleted file mode 100644
index bdefaac..0000000
--- a/data/fonts/DroidSansArabic.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansArmenian.ttf b/data/fonts/DroidSansArmenian.ttf
deleted file mode 100644
index 6fafa54..0000000
--- a/data/fonts/DroidSansArmenian.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansEthiopic-Bold.ttf b/data/fonts/DroidSansEthiopic-Bold.ttf
deleted file mode 100644
index e06cac2..0000000
--- a/data/fonts/DroidSansEthiopic-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansEthiopic-Regular.ttf b/data/fonts/DroidSansEthiopic-Regular.ttf
deleted file mode 100644
index 0adcbbe..0000000
--- a/data/fonts/DroidSansEthiopic-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansGeorgian.ttf b/data/fonts/DroidSansGeorgian.ttf
deleted file mode 100644
index 3a2e9fb..0000000
--- a/data/fonts/DroidSansGeorgian.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansHebrew-Bold.ttf b/data/fonts/DroidSansHebrew-Bold.ttf
deleted file mode 100644
index c1acb38..0000000
--- a/data/fonts/DroidSansHebrew-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSansHebrew-Regular.ttf b/data/fonts/DroidSansHebrew-Regular.ttf
deleted file mode 100644
index af6a58d..0000000
--- a/data/fonts/DroidSansHebrew-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSerif-Bold.ttf b/data/fonts/DroidSerif-Bold.ttf
deleted file mode 100644
index 16a914e..0000000
--- a/data/fonts/DroidSerif-Bold.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSerif-BoldItalic.ttf b/data/fonts/DroidSerif-BoldItalic.ttf
deleted file mode 100644
index 50324fc..0000000
--- a/data/fonts/DroidSerif-BoldItalic.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSerif-Italic.ttf b/data/fonts/DroidSerif-Italic.ttf
deleted file mode 100644
index bb2757c..0000000
--- a/data/fonts/DroidSerif-Italic.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/DroidSerif-Regular.ttf b/data/fonts/DroidSerif-Regular.ttf
deleted file mode 100644
index da0a2cc..0000000
--- a/data/fonts/DroidSerif-Regular.ttf
+++ /dev/null
Binary files differ
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index ede7ef4..c2d5afe 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -31,23 +31,26 @@
 <familyset>
     <family>
         <fileset>
-            <file variant="elegant">DroidNaskh-Regular.ttf</file>
+            <file variant="elegant">NotoNaskh-Regular.ttf</file>
+            <file variant="elegant">NotoNaskh-Bold.ttf</file>
         </fileset>
     </family>
     <family>
         <fileset>
-            <file variant="compact">DroidNaskhUI-Regular.ttf</file>
+            <file variant="compact">NotoNaskhUI-Regular.ttf</file>
+            <file variant="compact">NotoNaskhUI-Bold.ttf</file>
         </fileset>
     </family>
     <family>
         <fileset>
-            <file>DroidSansEthiopic-Regular.ttf</file>
+            <file>NotoSansEthiopic-Regular.ttf</file>
+            <file>NotoSansEthiopic-Bold.ttf</file>
         </fileset>
     </family>
     <family>
         <fileset>
-            <file>DroidSansHebrew-Regular.ttf</file>
-            <file>DroidSansHebrew-Bold.ttf</file>
+            <file>NotoSansHebrew-Regular.ttf</file>
+            <file>NotoSansHebrew-Bold.ttf</file>
         </fileset>
     </family>
     <family>
@@ -64,12 +67,14 @@
     </family>
     <family>
         <fileset>
-            <file>DroidSansArmenian.ttf</file>
+            <file>NotoSansArmenian-Regular.ttf</file>
+            <file>NotoSansArmenian-Bold.ttf</file>
         </fileset>
     </family>
     <family>
         <fileset>
-            <file>DroidSansGeorgian.ttf</file>
+            <file>NotoSansGeorgian-Regular.ttf</file>
+            <file>NotoSansGeorgian-Bold.ttf</file>
         </fileset>
     </family>
     <family>
@@ -84,6 +89,32 @@
             <file variant="compact">NotoSansDevanagariUI-Bold.ttf</file>
         </fileset>
     </family>
+    <!-- Gujarati should come after Devanagari -->
+    <family>
+        <fileset>
+            <file variant="elegant">NotoSansGujarati-Regular.ttf</file>
+            <file variant="elegant">NotoSansGujarati-Bold.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
+            <file variant="compact">NotoSansGujaratiUI-Regular.ttf</file>
+            <file variant="compact">NotoSansGujaratiUI-Bold.ttf</file>
+        </fileset>
+    </family>
+    <!-- Gurmukhi should come after Devanagari -->
+    <family>
+        <fileset>
+            <file variant="elegant">NotoSansGurmukhi-Regular.ttf</file>
+            <file variant="elegant">NotoSansGurmukhi-Bold.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
+            <file variant="compact">NotoSansGurmukhiUI-Regular.ttf</file>
+            <file variant="compact">NotoSansGurmukhiUI-Bold.ttf</file>
+        </fileset>
+    </family>
     <family>
         <fileset>
             <file variant="elegant">NotoSansTamil-Regular.ttf</file>
@@ -146,6 +177,12 @@
     </family>
     <family>
         <fileset>
+            <file>NotoSansSinhala-Regular.ttf</file>
+            <file>NotoSansSinhala-Bold.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
             <file variant="elegant">NotoSansKhmer-Regular.ttf</file>
             <file variant="elegant">NotoSansKhmer-Bold.ttf</file>
         </fileset>
@@ -170,18 +207,24 @@
     </family>
     <family>
         <fileset>
+            <file variant="elegant">NotoSansMyanmar-Regular.ttf</file>
+            <file variant="elegant">NotoSansMyanmar-Bold.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
+            <file variant="compact">NotoSansMyanmarUI-Regular.ttf</file>
+            <file variant="compact">NotoSansMyanmarUI-Bold.ttf</file>
+        </fileset>
+    </family>
+    <family>
+        <fileset>
             <file>NanumGothic.ttf</file>
         </fileset>
     </family>
     <family>
         <fileset>
-            <file>Padauk-book.ttf</file>
-            <file>Padauk-bookbold.ttf</file>
-        </fileset>
-    </family>
-    <family>
-        <fileset>
-            <file>NotoSansSymbols-Regular.ttf</file>
+            <file>NotoSansSymbols-Regular-Subsetted.ttf</file>
         </fileset>
     </family>
     <family>
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 293ecc8..2312a04 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -34,17 +34,7 @@
     RobotoCondensed-BoldItalic.ttf \
     RobotoCondensed-Light.ttf \
     RobotoCondensed-LightItalic.ttf \
-    DroidNaskh-Regular.ttf \
-    DroidNaskhUI-Regular.ttf \
-    DroidSansHebrew-Regular.ttf \
-    DroidSansHebrew-Bold.ttf \
-    DroidSerif-Regular.ttf \
-    DroidSerif-Bold.ttf \
-    DroidSerif-Italic.ttf \
-    DroidSerif-BoldItalic.ttf \
     DroidSansMono.ttf \
-    DroidSansArmenian.ttf \
-    DroidSansGeorgian.ttf \
     AndroidEmoji.ttf \
     Clockopia.ttf \
     AndroidClock.ttf \
diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml
index a8d23ee..97b7fd8 100644
--- a/data/fonts/system_fonts.xml
+++ b/data/fonts/system_fonts.xml
@@ -89,10 +89,10 @@
             <name>ITC Stone Serif</name>
         </nameset>
         <fileset>
-            <file>DroidSerif-Regular.ttf</file>
-            <file>DroidSerif-Bold.ttf</file>
-            <file>DroidSerif-Italic.ttf</file>
-            <file>DroidSerif-BoldItalic.ttf</file>
+            <file>NotoSerif-Regular.ttf</file>
+            <file>NotoSerif-Bold.ttf</file>
+            <file>NotoSerif-Italic.ttf</file>
+            <file>NotoSerif-BoldItalic.ttf</file>
         </fileset>
     </family>