Merge "Import translations. DO NOT MERGE am: 717de1098c  -s ours am: 0d513ac8af  -s ours" into nyc-mr1-dev-plus-aosp