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

Change-Id: Ife31a8953c068fd71096d96c2ee306dcfc5d8bd2