am 7d5178e9: Merge "Add textDirection="locale""

* commit '7d5178e9fbfe6fa8d473ecb7848fba05e90134bd':
  Add textDirection="locale"