am b2c02637: (-s ours) Merge "Lightweight fix for incorrect locale changes -...
am b2c02637: (-s ours) Merge "Lightweight fix for incorrect locale changes - DO NOT MERGE" into lmp-mr1-dev
automerge: ae5af13a -s ours
* commit 'ae5af13a':
Lightweight fix for incorrect locale changes - DO NOT MERGE