Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 9531d0fd0b  -s ours
am: 0a56ce8d2f  -s ours

Change-Id: I5f64bda490f2f99f51f7f1e5714314d51e2e1d26