Adjust layout for readability in different languages

Change-Id: Iddee1ce9b25819711acd01298a4128312f88b0ae
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0