Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7c1b73eab7  -s ours
am: 0412212ef1  -s ours

Change-Id: Iad4bbdabecda86f3ba1420a8fcfa3c7b3e2a7752