Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 237b52f40c  -s ours am: 1bef62e488  -s ours am: 166d6e9254  -s ours"