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

Change-Id: I54b0af65116278dc870e157f2c36a632039513a6