Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: dbfd3a837e  -s ours am: 2e07e8a9dd  -s ours
am: f3e176a5df  -s ours

Change-Id: Ibd7c4501e76a3a2f7191352ac3ed6f1290edc3e2