am 2158da38: (-s ours) am 011676f9: Fix language settings for Canada.

* commit '2158da38317ad2fe2a0edd5c5aef13b20311dac1':