Merge "Import translations. DO NOT MERGE" into oc-dev am: c3a4610413  -s ours
am: 76a409a3f7  -s ours

Change-Id: I6373cb3493015bab47279704a047c3d77a52285e