Merge "Import translations. DO NOT MERGE am: e124c9bd46  -s ours am: 0cd75faa35  -s ours" into nyc-mr2-dev-plus-aosp