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

* commit '461e71472df1942936c27fb65f46b72c3eb4ab1b':
  Clear locales without changing layout direction.

Change-Id: I0db0a2e72765632803a17dce56857207ffc146e9