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

Change-Id: Iadb23aebd270d96d6597e654b6ba5f417b023e96