Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 65266b99d2  -s ours am: f924f2130f  -s ours
am: 7c00e15378  -s ours

Change-Id: I46cf8b8313224c4e4b85a0b02368aa5f9a180395