Merge "Import translations. DO NOT MERGE am: 5f7a262515  -s ours am: 326fa2ad13  -s ours" into oc-dr1-dev-plus-aosp