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

Change-Id: Id56d660a706002cac6c562e206637be16e90dcda