Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: cfbb3c81b1  -s ours
am: 5bb2c08c53  -s ours

Change-Id: I4186738f946b4047d3eb1bc5dea70f4e938e8098