Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186  -s ours
am: 0ad45f6f76  -s ours

Change-Id: I95efa84b8030ee19fd38e900466dadf0348cb309