Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 36f8170bbc  -s ours am: 4ad5263a52  -s ours"