Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3a8be1ae39  -s ours am: cb562a40d9  -s ours am: 323dc6b0d0  -s ours"