Merge "Import translations. DO NOT MERGE" into oc-dev am: a53f8a9128  -s ours
am: 92547f4b39  -s ours

Change-Id: Ib98981df6ecefe159ea9b394e29ed8c94d19475c