Merge "Import translations. DO NOT MERGE am: 4fd35e0578  -s ours am: f46f825edd  -s ours" into nyc-mr1-dev-plus-aosp