Merge \"Import translations. DO NOT MERGE\" into cw-f-dev
am: 1dfa221fd7  -s ours

Change-Id: Ief7555cb389e7a063de1d10b35e2da52491bfbb9