Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f  -s ours
am: 503eab4469  -s ours

Change-Id: I4144956fc0670fb706b11348ae140c122cde81a7