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

Change-Id: Ib0d03d9eb881245bbbc15a3c201a01938f076b1a