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

Change-Id: I1a74337f7fb7ac6d5b157f5a8baa62d0703e2ec4