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

Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f