Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: a62d335d5b  -s ours am: 5a10418bf0  -s ours" into nyc-mr1-dev-plus-aosp