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

Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944