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

Change-Id: I711cdf888e217534fc50d3beae235cc516a28434