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

* commit '5ac2c3b4a0e646884b6998fbccf538145cf70e7a':
  Clear locales without changing layout direction.

Change-Id: I06ee22dda58c9e6f83a0e829992ff8d3ddf96928