Merge "Import translations. DO NOT MERGE" into oc-dev am: 20748da300  -s ours
am: d327ad395b  -s ours

Change-Id: I2b8b6ab846ae003a25695289b448dce7a2374bbe