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

Change-Id: I00e17922016c5ff66d433948e4e294fc530e5121