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

Change-Id: I4cdda925e378df0b674bae5c01ab9118d91d0dce