Merge "Merge "Import translations. DO NOT MERGE am: 2c1d066618  -s ours" into oc-mr1-dev am: 8506d1085e  -s ours am: 5d44e5c045  -s ours"