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