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

Change-Id: I14cbe78cdcb23fd8f82103395f057dca03a3b171