Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 60ec912326  -s ours
am: a72e8c77e1  -s ours

Change-Id: I91eb370fc8609ca0f1362ddc1b2aa94e6c8e3803