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

Change-Id: I7e07b391f3af5df8b4077fe3c1c357cb14afcc18