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

Change-Id: I26f441bc84359e2ef490cc70867ee1b738ec85d8