Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545  -s ours am: 611a6ffe29  -s ours" into oc-dr1-dev