Merge "Locale based string alignment changes in BT." into mnc-dev