Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c3f81baeee  -s ours
am: 72b2814607  -s ours

Change-Id: Ib26e3fc87a63259b4a8aace9672cb87edce2a116