Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 64d6fddc4b  -s ours am: 25ad61262e  -s ours\" into nyc-mr1-dev-plus-aosp
am: 73085fc99a  -s ours

Change-Id: If44a811f31dc752d2d44184e5d553a78e1f0db0e