Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: cfbb3c81b1  -s ours am: 630dee082d  -s ours
am: 9fe1355a52  -s ours

Change-Id: I2b1ed75a4824d5ef48ad779b27d77274af061a67