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

Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab