Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: dbfd3a837e  -s ours am: 2330bda48b  -s ours
am: 9d5b5ad34e  -s ours

Change-Id: I11a45045f1ed1c4519fc10232e693a4203eb53a9