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

Change-Id: I4572d5501da94623679e96e4102c9ab3ac3f3982