36d4cc8d2b
Bug: 10625246 Change-Id: I32530a992beeafe2ee16da36f0dc0a752c647cc6 (cherry picked from commit 5d34e4d679e6237b0d075177d1e365161c684445) Conflicts: data/fonts/fallback_fonts.xml