Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a2dabae9 -s ours" into cw-f-dev