Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d  -s ours am: 2b492b6502  -s ours
am: 8d1cdbb135  -s ours

Change-Id: I5ae31f699edb0155b27dacccea4ed5972f8cb666