Merge "Import translations. DO NOT MERGE" into oc-dev am: 03150c4a29  -s ours
am: 97c12deabb  -s ours

Change-Id: I4478c1637241a89f668dfba9747fc6c488026141