am a1fa08e8: am dd7a3706: (-s ours) am 0d1d0f4b: am 519e77bb: am 44cc867f: (-s ours) am 9a1f13a4: am afc623e3: am bd9e181b: Fix layout rendering for RTL locales [DO NOT MERGE]

* commit 'a1fa08e8f9aee421041df008e0c8cd98220276a6':
  Fix layout rendering for RTL locales [DO NOT MERGE]