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

Change-Id: I629a9d1b140dff3fa2f96d28bae37e062879e1d2