Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 47e6925d54  -s ours
am: 933403af15  -s ours

Change-Id: I386412764c908235063aac8dbcd23d8a911a0950