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

Change-Id: If30c9b4f2db32d59fe3ec0eec7ce3e08fe3c50c2