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