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

Change-Id: I9fb4315a0f842493657db51e14bcf5a5554cae0c