Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 2619c76cb1  -s ours
am: 00d60d3076  -s ours

Change-Id: Ibfdc84594e644923ee2a894335ca9ff9bb5bf67c