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

Change-Id: I54902004b078c6596c43eb0d35bf8376b6c7f11a