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

Change-Id: Ice6116e80bcca10df08e8d6b178911f0b266e922