Merge "Add fr (French) language fallback for br, nrm, oc"