Merge \"Import translations. DO NOT MERGE\" into ub-launcher3-calgary
am: c22e626217  -s ours

Change-Id: I2dd11d298ec4a38dc03aa4e014ec0686dd3e387d