Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5086fe2800  -s ours
am: d89e27a99c  -s ours

Change-Id: Ie809c0c18515f02d55157caee8d252b1a4273143