Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a1bde913 -s ours am: cccb304a -s ours" into oc-dr1-dev