Merge "Import translations. DO NOT MERGE" into oc-dev am: d406f38d24  -s ours
am: 08947751fd  -s ours

Change-Id: I62dfb3722c51f91adc59a568c6d92e0e608bbf50