Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 2f9af2aa -s ours am: 04f8ba7b -s ours"