Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 77f30cd209  -s ours
am: a2c31f5dfe  -s ours

Change-Id: Ia7c4b49e4fd9fa7f56be4c4aadd45d41b73062da