Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 37f09d5a49  -s ours am: e46269c611  -s ours"