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

Change-Id: I3b3fcd195350c100140b6278a8f91f3b0b4e529e