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

Change-Id: I69117be7b79ef4765d9390b34c0101141ba7831a