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

Change-Id: I93a17573d5be751e02698e8731fd383b67db11a3