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

Change-Id: I6a9d2f7b3d69c6ea5bbd60496e101f362bed07b6