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

Change-Id: I95e2f49dc0cc9c7ecb6202196b28eb4b5486777d