Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7220f64f71  -s ours
am: 4d28b4b229  -s ours

Change-Id: I93f39c2af45f9362db605ed49b8538aad28f00d2