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

Change-Id: Ief3a2219a09165b4dfa0c79f5e10098843eadc30