Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 8f278a7e06  -s ours

Change-Id: Id255f1ceb395e545f87ed91bd31f619ea9bcb06f