Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: bb8b32262f  -s ours am: 960a0a8fec  -s ours\" into nyc-mr1-dev-plus-aosp
am: 70c36466ca  -s ours

Change-Id: Iba9c2779c825ceabd1e8738b8b784c1d509d34ab