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

Change-Id: I752b035661e7457b98242313e9a55e9cc43ebf88