Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 31cd8615b2  -s ours am: 498f780f42  -s ours" into nyc-mr1-dev-plus-aosp