Merge "Import translations. DO NOT MERGE am: 495d4ce1b9  -s ours am: 120c3e9874  -s ours" into oc-dr1-dev
am: 70906280eb  -s ours

Change-Id: If5ae8d80646e4b2c68516e1441bc3b856c204907