Fix French, English UK, Swiss german layout issues.

Bug: 312075583
Bug: 312396589
Bug: 312375634
Test: None
Change-Id: I1b2d3931c845b3b369963558b22d9947774ab8a2
3 files changed