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

Change-Id: I7abd0a0cce9a39061be91be90e26585f2bb5f5a4