Merge "Add Japanese to fallback fonts"