Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 7ce75172dd  -s ours am: 933d21c9ea  -s ours
am: 5af410e54f  -s ours

Change-Id: I44527d911592d00061d2c91768a6962851148434