Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e1ca34b5c7  -s ours am: d5a7faea83  -s ours
am: bd14c44fd8  -s ours

Change-Id: I0560d15c8c2df65b61818ccbb12f5057d1a0c5c8