Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 972b902171  -s ours am: 2729e09857  -s ours
am: 79d910104a  -s ours

Change-Id: Ic2280c9d719e787aa0618d02a2b20f37f10d66cc