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

Change-Id: Id2bfbe894e47451efc8159a8cd692537d4f291f5