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

Change-Id: I48b1ac28f2fb40508860cd34c92093c09d2f5638