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

Change-Id: Icc605bca96905c647601df651186850c874b5442