Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 002ccec5c1  -s ours am: ee384436c1  -s ours
am: b880af58f2  -s ours

Change-Id: I0b9abdb32882e22dd8def01f9de22a360c862eaf