Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 9dbd07ef32  -s ours

Change-Id: Iff6600a2165f9d017a4458f4a78efc501dbfc09d