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

Change-Id: I3acd580690e2bca34b21d600225f53ac7b467185