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

Change-Id: Icaaa9992ba23d840e46ab7ab774dadb7c279ba7b