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

Change-Id: I3da9d4d737f0aaa57aef597dfe30a50cfe576587