Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 7c1a615cf4  -s ours
am: c8a9a78dd8  -s ours

Change-Id: I878464cca2d5375f15b61fbbb9be5eb9a233f851