Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 7ce75172dd  -s ours
am: 31e9b4c8c7  -s ours

Change-Id: If391bdaadf13a3050e400f41cc7317113587fc16