Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8bcd7a1a5a  -s ours
am: 82b9923827  -s ours

Change-Id: I6171f2210408fc7f8016fa5f23612a14ceeb95ba