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

Change-Id: I5902c14534f0ab429a5ad3aecb12275329f34b8b