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

Change-Id: Icec15bf6ba22bcc99d67be38e3967e6f6a227daf