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

Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9