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

Change-Id: Icd021e0bb8dfe54ed8b441bd5883e2ab767bc613