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

Change-Id: I2291d935b088a54cdb71524770c47b8be7dc97ae