Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d1a0f6e94 -s ours" into tm-dev