Merge "Import translations. DO NOT MERGE" into oc-dev am: 3781f41dda  -s ours
am: 560ba53cf6  -s ours

Change-Id: I5c3d6e3cd9976f9625c2facfa7f2dfec1dae348f