Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb