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

Change-Id: I9514e9874725fe1dab83d32869ea6a3ef83248f7