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

Change-Id: Ie4b75555b55767bb741d6e9c767ec3bfe52d0b23