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

Change-Id: I83cbeb9a2398fdecc3f45f108e25258a53448bcd