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

Change-Id: I6925457da9d330406fae0505bac1c3369d354320