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

Change-Id: Iab40dd880d5a6c97614b4958747e4e7d2010c6ed