Merge "Import translations. DO NOT MERGE" into oc-dev am: f36a995424  -s ours am: 270ef883af  -s ours
am: 8a32534a1d  -s ours

Change-Id: Iaf26e8a6bf2b3ffe2a251b14471cf0ba64aebdd5