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

Change-Id: I903b6acd81570e10845deee5fd8a8f0edd669f40