Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304  -s ours
am: f25fae7ea5  -s ours

Change-Id: I83d520d76aa9e4a285fc8b67cb14f7cb4e107fd6