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

Change-Id: Ibaab32fdbf118c13beec0ba8999404492ec9b2e8