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

Change-Id: I46781fadba2d9bfdc7664d62fe22d854e3fd0b72