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

Change-Id: Ie3665e5f71cf66f0eb36741a42244043b70b78b4