Merge "Import translations. DO NOT MERGE" into oc-dev
am: 88ab6c1304  -s ours

Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc