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

Change-Id: Ia04d214d9bfd1b2cfb3dc4f24f031d0236425564