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

Change-Id: Ia70e5266178ab687bac8299f6609825b54787b3c