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

Change-Id: I497f27dc7f50f9914b5157a4846c05ef4091abfd