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

Change-Id: Ib331eb4cf8882b271b11b756c43818a5b38c1664