Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d229cbb5b -s ours" into udc-dev