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

Change-Id: I1b705e6cdf7efb5f9b73f1b1f3dc7819f7430729