Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b1e6e0c6cd  -s ours
am: 76d32ec760  -s ours

Change-Id: If27dbfc6f10f35aaae5e4bde6d4dea0826527f02