Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 09cedc44b4  -s ours

Change-Id: I33f0f1c5bb67c375eac16b2619934c55dcabb504