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

Change-Id: I861573b79f654dc2486e42ffe9850ed1b503d93c