Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 33393ffa7d  -s ours
am: 7828d152d2  -s ours

Change-Id: I640cee52123e478ea482f1a4d0378de31de44475