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

Change-Id: I85b530c1946c4d2da5a4fefb6b343edb75b57697