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

Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46