Cherry-pick 1415f6d6 e0656091d b9dcb7aea5

https://mingle.corp.wikimedia.org/projects/internationalization/cards/3854

Change-Id: I396c84f6119b3df3d58046664092be6ce336c204