Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 4efa8bdb37  -s ours
am: f477fde8a9  -s ours

Change-Id: I46ce438c05cc9481cfc84edc572841a533d8e4c1