Merge "Import translations. DO NOT MERGE am: 495d4ce1b9  -s ours am: 120c3e9874  -s ours" into oc-dr1-dev