Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: e565e09067  -s ours
am: 0f68b8c55f  -s ours

Change-Id: I364803969e59563090d11ff3205172f4957212d3