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

Change-Id: Ie8ff9d5529c7c31c73927a1ada72256dd968f494