Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76  -s ours
am: cf0bd1675c  -s ours

Change-Id: Ie9feffc019d1b9c6ae956596c3f1a367700ee39d