am 68411471: Merge "Fix layout rendering for RTL locales" into jb-mr2-dev

* commit '68411471083abd7a7713483b5cd40f394387b7b3':
  Fix layout rendering for RTL locales