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

Change-Id: If23b7854224ec5320d2f912686deb3da10d34efb