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

Change-Id: I1af6c2584397a29d5128eea7cdcfb8d8c9c8e0a7