Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf  -s ours am: 9f05e68ea5  -s ours am: 8a18b56711  -s ours
am: 3ef3191d7f  -s ours

Change-Id: Ief7fa00fd8c99ddd794bd93ccc8705ebb4b8fbc9