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

Change-Id: Ie47998650cb3304201d7cedac9d5cea1015c14eb