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

Change-Id: I99e0718b5e031415d04140d76176f569b9576e04