Merge "Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 5ac2c3b4a0" into nyc-mr1-dev-plus-aosp
am: 9835c0c1f3

* commit '9835c0c1f390e6399b3a1bb9ba778f3a234e13db':

Change-Id: I1794c2b9dc35006e80a8fb362b9447286c26251f