Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 41454e6f4d  -s ours am: b3efadb4b2  -s ours"