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

Change-Id: Id493ab7235ae19c3a4faf74a11c8f7d6074c45c8