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

Change-Id: If1bba4f6237b39c86fc5fa998376683d78cd483e