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

Change-Id: I9d5c804341cf0ced313b8a82db933975b1089775